merge emacs-23
authorKenichi Handa <handa@m17n.org>
Mon, 27 Dec 2010 00:31:22 +0000 (09:31 +0900)
committerKenichi Handa <handa@m17n.org>
Mon, 27 Dec 2010 00:31:22 +0000 (09:31 +0900)

Trivial merge